From 5596eabd562aff7b1ddda9b11c184f943c26d898 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sun, 17 Aug 2008 23:09:08 +0000
Subject: [PATCH] Commit changes from last March (blush) for new web site to
 docbook generator.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3362 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/Makefile.in          |  6 +++---
 gpsbabel/vecs.c               |  2 +-
 gpsbabel/xmldoc/babelmain.xsl | 28 +++++++++++++++++++++-------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 2bf3f766e..612e5f08f 100644
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -183,14 +183,14 @@ dep:
 	echo "internal_styles.c: mkstyle.sh style/*.style\n	./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)"  >> /tmp/dep
 	echo Edit Makefile.in and bring in /tmp/dep
 
-$(WEB)/htmldoc-$(DOCVERSION)/readme.html: FORCE
+$(WEB)/htmldoc-$(DOCVERSION)/index.html: FORCE
 	mkdir -p $(WEB)/htmldoc-$(DOCVERSION)
 	perl xmldoc/makedoc
 	xmlwf xmldoc/readme.xml		#check for well-formedness
 	xmllint --noout --valid xmldoc/readme.xml    	#validate
 	xsltproc \
 	 --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \
-	 --stringparam root.filename "readme" \
+	 --stringparam root.filename "index" \
 	 xmldoc/babelmain.xsl \
 	 xmldoc/readme.xml
 	chmod 755 tools/mkcapabilities
@@ -233,7 +233,7 @@ gpsbabel.html: FORCE
 readme.txt: gpsbabel.html
 	lynx -nolist -dump gpsbabel.html  > $@
 
-doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/readme.html gpsbabel.pdf # readme.txt
+doc: gpsbabel $(WEB)/htmldoc-$(DOCVERSION)/index.html gpsbabel.pdf # readme.txt
 
 FORCE:
 
diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index 315ccd86d..31a28e9e0 100644
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -735,7 +735,7 @@ vecs_t vec_list[] = {
         {
                 &xol_vecs,
                 "xol",
-                "Swiss Map # (.xol) format",
+                "Swiss Map",
                 "xol"
         },
         {
diff --git a/gpsbabel/xmldoc/babelmain.xsl b/gpsbabel/xmldoc/babelmain.xsl
index 1bcac1910..132c2f9e0 100644
--- a/gpsbabel/xmldoc/babelmain.xsl
+++ b/gpsbabel/xmldoc/babelmain.xsl
@@ -6,29 +6,43 @@
 
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
 
-<xsl:param name="html.stylesheet">http://www.gpsbabel.org/style3.css</xsl:param>
 <xsl:param name="use.id.as.filename">1</xsl:param>
 <xsl:param name="chunk.first.sections">1</xsl:param>
 <xsl:param name="toc.section.depth">1</xsl:param>
 
-<xsl:template name="user.header.navigation">
+<xsl:template name="system.head.content">
+  <xsl:text>
+  </xsl:text>
+  <xsl:comment> InstanceBegin template="/Templates/primarypage.dwt" codeOutsideHTMLisLocked="false" </xsl:comment>
   <xsl:text>
+  </xsl:text>
+</xsl:template>
 
+<!--
+<xsl:template name="system.footer.content">
+  <xsl:text>
   </xsl:text>
-  <xsl:comment>#include virtual="../navbar.inc" </xsl:comment>
-  <xsl:comment>#include virtual="../doc-header.inc" </xsl:comment>
+  <xsl:comment> InstanceEnd </xsl:comment>
   <xsl:text>
+  </xsl:text>
+</xsl:template>
+-->
+
 
+<xsl:template name="user.header.navigation">
+  <xsl:text> 
   </xsl:text>
+  <xsl:comment> InstanceBeginEditable name="scontent" </xsl:comment> 
 </xsl:template>
 
 <xsl:template name="user.footer.navigation">
   <xsl:text>
-
   </xsl:text>
-  <xsl:comment>#include virtual="../doc-footer.inc" </xsl:comment>
+  <xsl:comment> InstanceEndEditable </xsl:comment>
+  <xsl:text>
+  </xsl:text>
+  <xsl:comment> InstanceEnd </xsl:comment>
   <xsl:text>
-
   </xsl:text>
 </xsl:template>
  
-- 
2.30.2